Index: rave-portal-resources/src/main/webapp/css/rave.css
===================================================================
--- rave-portal-resources/src/main/webapp/css/rave.css	(revision 1328013)
+++ rave-portal-resources/src/main/webapp/css/rave.css	(revision )
@@ -5,8 +5,10 @@
     margin-right: auto;
 }
 
-.navbar-spacer{
-    margin-top: 50px;
+/* Overwrite setitngs for navbar to remove need for spacer */
+.navbar-fixed-top {
+    position: static;
+    margin-bottom: 18px;
 }
 
 /* page menu related styles */
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp	(revision 1328013)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp	(revision )
@@ -19,43 +19,50 @@
 <%@ page language="java" trimDirectiveWhitespaces="true" %>
 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 <fmt:setBundle basename="messages"/>
-<header class="navbar navbar-fixed-top">
-    <nav>
-        <a class="brand" href="#">${pagetitle}</a>
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <span class="brand">${pagetitle}</span>
+            <div class="nav-collapse">
-        <ul class="nav pull-right">
-            <li>
-                <a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}"/>"><fmt:message
-                        key="page.addwidget.title"/></a>
-            </li>
-            <li>
-                <c:choose>
-                    <c:when test="${empty referringPageId}">
-                        <spring:url value="/index.html" var="gobackurl"/>
-                    </c:when>
-                    <c:otherwise>
-                        <spring:url value="/app/page/view/${referringPageId}" var="gobackurl"/>
-                    </c:otherwise>
-                </c:choose>
-                <a href="<c:out value="${gobackurl}"/>"><fmt:message key="page.general.back"/></a>
-            </li>
+                <ul class="nav pull-right">
+                    <li>
+                        <a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}"/>"><fmt:message
+                            key="page.addwidget.title"/></a>
+                    </li>
+                    <li>
+                        <c:choose>
+                            <c:when test="${empty referringPageId}">
+                                <spring:url value="/index.html" var="gobackurl"/>
+                            </c:when>
+                            <c:otherwise>
+                                <spring:url value="/app/page/view/${referringPageId}" var="gobackurl"/>
+                            </c:otherwise>
+                        </c:choose>
+                        <a href="<c:out value="${gobackurl}"/>"><fmt:message key="page.general.back"/></a>
+                    </li>
 
-            <sec:authorize url="/app/admin/">
-                <li>
-                    <a href="<spring:url value="/app/admin/"/>">
-                        <fmt:message key="page.general.toadmininterface"/>
-                    </a>
-                </li>
-            </sec:authorize>
-            <li>
-                <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
-                    <fmt:message key="page.general.logout"/></a>
-            </li>
+                    <sec:authorize url="/app/admin/">
+                        <li>
+                            <a href="<spring:url value="/app/admin/"/>">
+                            <fmt:message key="page.general.toadmininterface"/>
+                            </a>
+                        </li>
+                    </sec:authorize>
+                    <li>
+                        <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
+                        <fmt:message key="page.general.logout"/></a>
+                    </li>
-
-        </ul>
+                </ul>
-    </nav>
-</header>
+            </div>
+        </div>
+    </div>
+</div>
 
-
 <div class="container-fluid navbar-spacer">
     <div class="row-fluid">
         <section class="span8">
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp	(revision 1328013)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp	(revision )
@@ -23,49 +23,57 @@
 <jsp:useBean id="pages" type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/>
 <jsp:useBean id="pageLayouts" type="java.util.List<org.apache.rave.portal.model.PageLayout>" scope="request"/>
 <%--@elvariable id="page" type="org.apache.rave.portal.model.Page"--%>
-<header class="navbar navbar-fixed-top">
-    <nav>
-        <a class="brand" href="#">
-            <fmt:message key="page.home.welcome"><fmt:param>
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <span class="brand">
+                <fmt:message key="page.home.welcome">
+                    <fmt:param>
-                <c:choose>
-                    <c:when test="${not empty page.owner.displayName}"><c:out value="${page.owner.displayName}"/></c:when>
-                    <c:otherwise><c:out value="${page.owner.username}"/></c:otherwise>
-                </c:choose>
-            </fmt:param>
-            </fmt:message>
+                        <c:choose>
+                            <c:when test="${not empty page.owner.displayName}"><c:out value="${page.owner.displayName}"/></c:when>
+                            <c:otherwise><c:out value="${page.owner.username}"/></c:otherwise>
+                        </c:choose>
+                    </fmt:param>
+                </fmt:message>
-
-        </a>
+            </span>
+            <div class="nav-collapse">
-        <ul class="nav pull-right">
-            <li>
-                <c:set var="profileUrl">/app/person/<sec:authentication property="principal.username"/>?referringPageId=${page.entityId}
-                </c:set>
-                <a href="<spring:url value="${profileUrl}" />">
-                    <fmt:message key="page.profile.title">
-                        <fmt:param><c:out value="${page.owner.displayName}"/></fmt:param>
-                    </fmt:message>
-                </a>
-            </li>
-            <li>
-                <a href="<spring:url value="/app/store?referringPageId=${page.entityId}" />">
-                    <fmt:message key="page.store.title"/>
-                </a>
-            </li>
-            <sec:authorize url="/app/admin/">
-                <li>
-                    <a href="<spring:url value="/app/admin/"/>">
-                        <fmt:message key="page.general.toadmininterface"/>
-                    </a>
-                </li>
-            </sec:authorize>
-            <li>
-                <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
-                    <fmt:message key="page.general.logout"/></a>
-            </li>
-        </ul>
+                <ul class="nav pull-right">
+                    <li>
+                        <c:set var="profileUrl">/app/person/<sec:authentication property="principal.username"/>?referringPageId=${page.entityId}
+                        </c:set>
+                        <a href="<spring:url value="${profileUrl}" />">
+                        <fmt:message key="page.profile.title">
+                            <fmt:param><c:out value="${page.owner.displayName}"/></fmt:param>
+                        </fmt:message>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="<spring:url value="/app/store?referringPageId=${page.entityId}" />">
+                        <fmt:message key="page.store.title"/>
+                        </a>
+                    </li>
+                    <sec:authorize url="/app/admin/">
+                        <li>
+                            <a href="<spring:url value="/app/admin/"/>">
+                            <fmt:message key="page.general.toadmininterface"/>
+                            </a>
+                        </li>
+                    </sec:authorize>
+                    <li>
+                        <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
+                        <fmt:message key="page.general.logout"/></a>
+                    </li>
+                </ul>
-    </nav>
-</header>
+            </div>
+        </div>
+    </div>
+</div>
 
-
 <input id="currentPageId" type="hidden" value="${page.entityId}"/>
 <c:set var="hasOnlyOnePage" scope="request">
     <c:choose>
@@ -75,7 +83,7 @@
 </c:set>
 
 
-<div class="container-fluid navbar-spacer">
+<div class="container-fluid">
     <nav>
         <ul class="nav nav-tabs">
             <c:forEach var="userPage" items="${pages}">
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp	(revision 1328013)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp	(revision )
@@ -19,47 +19,53 @@
 <%@ page language="java" trimDirectiveWhitespaces="true" %>
 <%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
 <fmt:setBundle basename="messages"/>
-<header>
-    <nav>
-        <div class="navbar navbar-fixed-top">
+<div class="navbar navbar-fixed-top">
-            <a class="brand" href="#"><fmt:message key="page.addwidget.title"/></a>
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <span class="brand"><fmt:message key="page.addwidget.title"/></span>
+            <div class="nav-collapse">
-            <ul class="nav pull-right">
-                <c:if test="${not empty referringPageId}">
-                    <li>
-                        <a href="<spring:url value="/app/store?referringPageId=${referringPageId}" />">
+                <ul class="nav pull-right">
+                    <c:if test="${not empty referringPageId}">
+                        <li>
+                            <a href="<spring:url value="/app/store?referringPageId=${referringPageId}" />">
                             <fmt:message key="page.widget.backToStore"/>
-                        </a>
-                    </li>
-                </c:if>
+                            </a>
+                        </li>
+                    </c:if>
+
-                <li>
-                    <c:choose>
-                        <c:when test="${empty referringPageId}">
-                            <spring:url value="/index.html" var="gobackurl"/>
-                        </c:when>
-                        <c:otherwise>
-                            <spring:url value="/app/page/view/${referringPageId}" var="gobackurl"/>
-                        </c:otherwise>
-                    </c:choose>
-                    <a href="<c:out value="${gobackurl}"/>"><fmt:message key="page.general.back"/></a>
-                </li>
-                <sec:authorize url="/app/admin/">
-                    <li>
-                        <a href="<spring:url value="/app/admin/"/>">
+                    <li>
+                        <c:choose>
+                            <c:when test="${empty referringPageId}">
+                                <spring:url value="/index.html" var="gobackurl"/>
+                            </c:when>
+                            <c:otherwise>
+                                <spring:url value="/app/page/view/${referringPageId}" var="gobackurl"/>
+                            </c:otherwise>
+                        </c:choose>
+                        <a href="<c:out value="${gobackurl}"/>"><fmt:message key="page.general.back"/></a>
+                    </li>
+                    <sec:authorize url="/app/admin/">
+                        <li>
+                            <a href="<spring:url value="/app/admin/"/>">
                             <fmt:message key="page.general.toadmininterface"/>
-                        </a>
-                    </li>
-                </sec:authorize>
-                <li>
-                    <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
+                            </a>
+                        </li>
+                    </sec:authorize>
+                    <li>
+                        <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
                         <fmt:message key="page.general.logout"/></a>
-                </li>
+                    </li>
-
-            </ul>
-        </div>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
 
-    </nav>
-</header>
-
 <div class="container">
     <h2><fmt:message key="page.addwidget.form.header"/></h2>
     <form:errors path="widget" cssClass="error" element="p"/>
Index: rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag	(revision 1328013)
+++ rave-portal-resources/src/main/webapp/WEB-INF/tags/header.tag	(revision )
@@ -21,18 +21,25 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ attribute name="pageTitle" required="false" description="The title of the page" %>
 <fmt:setBundle basename="messages"/>
-<header>
-    <nav>
-        <%--@elvariable id="topnav" type="org.apache.rave.portal.web.model.NavigationMenu"--%>
-        <c:if test="${not empty topnav}">
-            <div class="navbar navbar-fixed-top">
+<c:if test="${not empty topnav}">
+    <div class="navbar navbar-fixed-top">
-                <a class="brand" href="#"><c:out value="${pageTitle}"/></a>
+        <div class="navbar-inner">
+            <div class="container">
+                <%--@elvariable id="topnav" type="org.apache.rave.portal.web.model.NavigationMenu"--%>
+                <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </a>
+                <span class="brand"><c:out value="${pageTitle}"/></span>
+                <div class="nav-collapse">
-                <ul class="nav pull-right">
-                    <c:forEach items="${topnav.navigationItems}" var="navItem">
-                        <li><a href="<spring:url value="${navItem.url}"/>"><fmt:message key="${navItem.name}"/></a></li>
-                    </c:forEach>
-                </ul>
-            </div>
+                    <ul class="nav pull-right">
+                        <c:forEach items="${topnav.navigationItems}" var="navItem">
+                            <li><a href="<spring:url value="${navItem.url}"/>"><fmt:message key="${navItem.name}"/></a></li>
+                        </c:forEach>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
-        </c:if>
+</c:if>
\ No newline at end of file
-    </nav>
-</header>
Index: rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
===================================================================
--- rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp	(revision 1328013)
+++ rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp	(revision )
@@ -42,35 +42,45 @@
 <!-- get the title of contact information -->
 <fmt:message key="page.personProfile.contact.info" var="contactInfo"/>
 
-<header>
-   	<nav class="topnav">
-       	<ul class="horizontal-list">
+<div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <span class="brand">${pageTitle}</span>
+            <div class="nav-collapse">
+                <ul class="nav pull-right">
-       		<li>
-                <c:choose>
-                    <c:when test="${empty referringPageId}">
-                        <spring:url value="/index.html" var="gobackurl"/>
-                    </c:when>
-                    <c:otherwise>
-                        <spring:url value="/app/page/view/${referringPageId}" var="gobackurl"/>
-                    </c:otherwise>
-                </c:choose>
-                <a href="<c:out value="${gobackurl}"/>"><fmt:message key="page.general.back"/></a>
-            </li>
-            <sec:authorize url="/app/admin/">
-                <li>
-                    <a href="<spring:url value="/app/admin/"/>">
-                        <fmt:message key="page.general.toadmininterface"/>
-                    </a>
-                </li>
-            </sec:authorize>
-       		<li>
-                <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
-                  <fmt:message key="page.general.logout"/></a>
-            </li>
-       	</ul>
+                    <li>
+                        <c:choose>
+                            <c:when test="${empty referringPageId}">
+                                <spring:url value="/index.html" var="gobackurl"/>
+                            </c:when>
+                            <c:otherwise>
+                                <spring:url value="/app/page/view/${referringPageId}" var="gobackurl"/>
+                            </c:otherwise>
+                        </c:choose>
+                        <a href="<c:out value="${gobackurl}"/>"><fmt:message key="page.general.back"/></a>
+                    </li>
+                    <sec:authorize url="/app/admin/">
+                        <li>
+                            <a href="<spring:url value="/app/admin/"/>">
+                            <fmt:message key="page.general.toadmininterface"/>
+                            </a>
+                        </li>
+                    </sec:authorize>
+                    <li>
+                        <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">
+                        <fmt:message key="page.general.logout"/></a>
+                    </li>
+                </ul>
-   	</nav>
-	<h1>${pageTitle}</h1>
-</header>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div id="person-profile-left">
     <div id="personProfileContent">
         <form:form id="editAccountForm" commandName="userProfile" action="person?referringPageId=${referringPageId}" method="POST">